bitkeeper revision 1.1159.1.147 (4141e72eeZrD_qHqY46QUsaCTAuNuQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

diff --cc xen/arch/x86/memory.c
index bae38bb04d9144dc8b5177b818ccd431c37735cb,acc5d37cd7219a73fa3808f0e9a8583e52962eb1..90faa65119565129ef6d1926f39ce9b515236afc
--- 1/xen/arch/x86/memory.c
--- 2/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@@ -1824,23 -1817,13 +1825,12 @@@ int ptwr_do_page_fault(unsigned long ad
              }
              else
              {
-                 l2_pgentry_t nl2e;
- 
                  if ( ptwr_info[cpu].disconnected_pteidx >= 0 )
                      ptwr_reconnect_disconnected();
-                 PTWR_PRINTK(PP_A, ("[A]    pl2e %p l2e %08lx pfn %08lx "
-                                    "taf %08x/%08x\n", pl2e,
-                                    l2_pgentry_val(*pl2e),
-                                    l1_pgentry_val(linear_pg_table
-                                                   [(unsigned long)pl2e >>
-                                                    PAGE_SHIFT]) >> PAGE_SHIFT,
-                                    frame_table[pfn].u.inuse.type_info,
-                                    frame_table[pfn].count_info));
-                 /* disconnect l1 page */
-                 nl2e = mk_l2_pgentry((l2_pgentry_val(*pl2e) & ~_PAGE_PRESENT));
-                 update_l2e(pl2e, *pl2e, nl2e);
+ 
+               /* No need to actually disconnect L1 anymore in v2 wr_pt  */
  
 -                ptwr_info[cpu].disconnected_pteidx =
 -                    (page->u.inuse.type_info & PGT_va_mask) >> PGT_va_shift;
 +                ptwr_info[cpu].disconnected_pteidx = va_mask;
                  PTWR_PRINTK(PP_A, ("[A] now pl2e %p l2e %08lx              "
                                     "taf %08x/%08x\n", pl2e,
                                     l2_pgentry_val(*pl2e),